Finished 1-7. Still need to test