Add basic stuff
Add more base functionality. Probably broken.
Basic functionality up and running.
Merge branch 'develop'