Refactor for reuse
Push more things down
Clean up, make use of reusable code