Adding stuff for account file list
Resolved merge conflicts