Version 1.0

First semi complete version. :0)
Taken permissions off frontend.
resolving merge conflict