WIP, more wrapper, more urls, more - and better organized - templates