This checkin is not final code - parcel level mapping

Also finding some small bugs in the developer model - will give more info when doing pull request