Proper Retreat

Fixes #60