Further devel

Have fun!
Yeah actually @vezzi you can probably skip reviewing this file for now. It needs cleaning up but I haven't reviewed it too thoroughly myself and I pulled it from the master branch of scilifelab so it should have been reviewed previously anyway