Added support for deployment list

Also refactored code to dry out errors and account getting