Various changes bringing this back to working state. First task is translating the Constants.
¥¥¥¥¥