Added hardcoded class
Started to rewrite fix.py to make use of the hardcoded class