Lunchtime; refactoring in progress