First sweep of the code base