I keep forgetting to commit

Most of the stuff is there