working well enough for alpha I think, everything past here is a bonus
updates