Deeper integration of GOMove