Improved Graphs!

Closes #12 (for now)