Most recent progress

Haven't done a commit in a while, this is what I've got going so far!