wip

---
Squash commit from https://github.com/ndahlquist/Whaler/pull/19 created by Whaler.