Selector Builder Changes

First stubs for selector builders, mainly factory related