Added options, functionally complete, no sorting