Core activity system made, all but Main class have benn marked up