Colin dev

Merging before I start working on new issues.