Legacy code retreat, work in progress...