WIP: Better pupil methods