Adding initial stuff
Merge https://github.com/JornWildt/Mason