kek
Final Testing changes!
I Lied lol
ReFAGtor
Merged with develop
Merge pull request #49 from SW3-P3/MoreTesting

More testing