Wip

Still multiple code replacements