Final commit I guess. Not perfect, but pretty good.
Revert "Final commit I guess. Not perfect, but pretty good."

This reverts commit 1b7da06d97aa279d98a31f206377be14ea4a5f1e.
Revert "Deleting stuff that shouldn't be in here"

This reverts commit 23fbb32252350764cb2b1639316890b2db86532c.
Final commit