Added todo's
Added error handling when javascript turned off