Updating

Updating from my branch (current) to here