Updated with package, all now compile
Updated packages, return types, compiles