Styling and things
Refactor
BUild