Working on the acceptance test, now.

Builds but does not pass.
2 files changed