Pulling the concrete classes out into a lib.