Complete overhaul ...
Have to refactor major parts of the system