Ongoing development on cp2k by myself. (Stuff not yet commited to SVN)