Bugs squashed, evaluating need of Graph..
Removed graph code and squashed bugs

Pretty well working now, and tests passing!