Getting closer to having it working