Everything is working... and sooooo much templating...
Fixed merge conflicts