Added some *magic* for API related junk as well as general code mess. Whoo! :sparkles: