Working on a bunch of refactoring and moving code.