Subgroup2

Finished implementation needed for group work to start.