Added sorting features and "power user" functions