WIP - attempting to pass all specs