Moved todos, and added an htacces change