Working
-Fixed something I shouldn't have touched earlier
-Added the remains of a failed gson attempt