Feature complete, time for refactooorrr