Temporary EyePad Refactor