all green, tons of refactoring