Branch support

A few fixes, most noticeably changing the instance variable in current user...
Still working on adding branch support, but I am closer