Forgot to add HW7, mostly feature-complete
Forgot to add HW7, feature-complete but a little ugly