Finish features for beta 1

[creatorfromhell]

This will require the Database rewrite to be done since some controllers will require database access to perform properly.