Fixed some issues with the API
Worked towards M2

Got quite a few things working. Now working on the user page stuff