cleaned up a bunch, getting templating set up