finished both main problems, did not do bonus