branch is now working.. still needs some serious work