#16 - restoring angular template and code from previous revert