Working on getting tests to pass, some pass, some still fail