re-structure to use boxen
Refactor to clean and organise to use with boxen