Added test update and sitting functionality
minor unit update
Enabled emailing.
Intermediate commit.
Merge remote-tracking branch 'origin/back-end-working' into back-end-working
Merge remote-tracking branch 'origin/master' into back-end-working