First initial draft of mapping finished