Renaming and refactoring, fully implemented PEEK.