WIP
Add very basic first implementation
Add todo's