[WIP] Merge Cycle into Walk

* [x] Merge Cycle into Walk
* [ ] 100% code coverage
* [ ] Documentation / changelog

Fixes #55.