Started adding in angle calculation