halfway through making code pass all checks