Kenny v3.3 devlopment

Update maste/development with my latest good dev stuff