Revert "OOP progress (Discarted)"

This reverts commit 08ab82c015b0b7cb05ff44c719994d21a706aae6.
Revert "Revert "labyrinth2""

This reverts commit caabe353fac6aaac6784e59126eb992456c6fa5f.
Revert "labyrinth2"

This reverts commit b0f8112d2887e2f499c2cfc30576aa854c6d7676.
Fixing Stuff