more templates fleshed out, some test things in here