Ported over load() method, added some basic tests