Moved lazyLoadState function
rebuilt after bugfix, hmm... how'd this get missed by the unit tests...