remappings semi-resolved (it compiles at least) and began working on …

remappings semi-resolved (it compiles at least) and began working on … #47