Added in options for the account poller
Correction for finish option
swapped around
test for new Account params
merge with master