More changes

- User stuff works (tested)
- Bookmarks will work soon