Merging all my work

This branch now caught up with my local.