Adjusted function calls to reference self, and added account extraction.

FIXME** Grabbing an account should be dynamic and optional (if more than one account exists user input should be requested).
This update will be for a later implementation, a ticket will be added now.