Init commit

In progress - Need to fix replacements