Restructure code to add concept of Account instance; Prep for #1