oops forgot to commit stuff, so here's a lot of stuff so far
as always, just playing around and testing