and from now on should not deviate from that...
hoping this does not break things terribly, but it needs to be done regardless so will just have to pick up pieces if so
more to come i'm sure, this is all i need so far
