partial watcardoffice implementation
finishing up watcardoffice
Merge branch 'watcardoffice'