Changed controller system to use properties array instead of class
variables