checked in latest changes.. not ready yet