More todos
Refactor build mappings.
Sort by mappings.