(WIP) - refactor order and structure of functions
(WIP) - Refactor markup