Finished todo; more work on root templates