need to pull latest commits from larry
merged conflict in edit.html