finished merging the template with the code. Doing the admin management stuff