WIP. Refactoring default code up