WIP - refactoring
Adding mockups