working through some functionality discrepancies
almost 100%
all tests are passing
cleaning up