some refactoring
project management
more management