Sample graphs are much closer to working correctly...
Edging closer to being fully functional...