get tests passing, add comments
templates
clean up