Devel

Merge this before starting to work on new stuff.