Fixed
Should be working on checking for nullification but I really
want to get my test units to run properly.