Work in progress at Refactor Soma Guidance Force Issue #16