Almost finished mapperdao integration. WIP