Start code revamp
Move away old code
Add code to load the units dictionary
Rename