Work in progress
Fixed merge issues...  Hopefully correctly
Added Caption -- everyone will need to migrate their DB