WIP 01.28.2014

Interim checkin of work-in-progress code as of January 28, 2014