Added position control - still need to clean tonight