Split logic from assign2
Merge branch 'master' of https://github.com/FerryRiet/SE-Testing