Wrote some stuff
Derp forgot to commit my merge