Issue #2 - almost ready for squash / PR