wip
awesome refactor; add user and user collections and yes!