Adding a nice trace. Partially fixes and closes #34