Dev

Bringing Master up to speed.