I dont remember what I did in most things. Closes #7