Work in progress. Stage two