Activity diagram, and more

Activity diagram, and more