Bugs squashed

-Lacks Testing
-Still working on Family and Team enrollment