Added position tracking and switched to quat