Changed work flow.
Should improve efficiency. Tests still need to be adjusted, accordingly.