Merge this :)

It's not fully complete yet, but I'm making some progress. I'll work on integrating the navigation into the template next.