add sorting, removal of specific items.

also: refactoring