resolved merge conflicts
added basic templates and views, passing information down