tweaked some things, got most items to work and then transferred over to customer as well