Home work 3

Still has a few bugs but I'm still working on it