More activities and small refactors.
Better domain model