Homemade deserialization works

Also Cleaned up Code