finished. testing now