reorganise, include stuff from verena closes #5