More improvements, skeleton for selection interface implemented.