Mostly refactoring. Still mostly spaghetti code