intial checkin
added comments
removed no longer needed defines