First commit w/ mock injection