Began adding selector type- and equation- loaders