Moved some stuff out of vim