Changes to API

Made a few changes to API to make it more OO.

Also testing how this git pull request thing works