Fixed merge error, commented out work in progress functions

I fixed the merge errors. Also we are currently running into a problem
with the sanitization functions, for testing purposes I have commented
them out and included only the working controller