Fixes to the FileUserAdapter
Major code restructuring to hopefully fix many lingering problems.
Code is most likely very buggy.