Get rid of redundant closing tags on all classes
Starting to look at fixing the authentication