completed most testing, need to comment things