Finish first implementation for Account