WIP 09.24.2014

Make it compile; last check-in was incomplete