Stuff and junk, must move to a new repo when this is finished