Lots of changes. Project is getting shelved for the time being.