New API to support multiple accounts per #

Might need some more test cases written and lots of code review, but here's to pull requesting early.