Development dylan

First attempt at merging work to master.