Tightened up all the functionatility

we're getting closer to all previous functionality ported over