Assignment 4 pretty much done