Fixed the remaining issues of class/method loading. I should be able to
begin testing tomorrow.