WIP adding basic stuff
Merge remote-tracking branch 'origin'