Patch 3

I think my part is ready to go