Beginning refactor from string replacements

Currently getting all the banes in