Actual functionality completed.

SDUX-74