Account module nearly complete