evening commit, cleaning up some api issues, about to add backbone