Some progress. Changed some property names amung other things.