clearing bugs
fix routes
adjusting controllers for security
merge conflicts
merge conflicts