LOTS of refactoring and more money drawing