pretty much done

need to clean up code and comment before final turn in