changed a lot of stuff and forgot to commit incrementally