Refactor massively and move to first-person perspective