Clean up, added addressing class, updated loader