check in template changes from thurs
checkin new changes from thurs
update TODO file
remove accidentally check in admin.py at toplevel
check in friday's work
check in more changes