leaving West tues eve. working on form for edit update
back at West Tues night about to get Ryans work
Merge branch 'chris2'