Added a couple of properties and started on the touch stuff