very unfinished work on activities
merged changes