Patch 1

This should send you everything in my branch.