trying to get the project in good shape