Started testing handlers. Fixing handler types.
Merge remote-tracking branch 'origin/master'