Resolve current errors in assignment

Resolve errors so that all test are passed. (or at least a solid 5/7...)