Wrote some stuff, cleaned up some stuff