problem solved i hope
Merge branch 'zed'
Herp the derp