found a bug. fixed some stuff. committing before getting rid of a bunch of commented out erroneous code
finished adding features