Commented definitions and stuff, beginning looking over it again