Dev

Merging these two, hope it'll work as I want it to.