ACTIVITY BRANCH - NEEDS COMPATIBILITY

@MARKUS: The database will need to be chagned to accommodate this!