working through

still working through how this is going to work
random changes