Added support for pre-selecting things properly, since that is somewhat important...