Missing files added.
Missing packages added.
Broke up properties class to individual variables.