Workign on the admin section, having issues with the db build, so I am
commiting so i can pull fresh master and merge into my bran ch.