Changed all classes to include getters/setters per Stack Overlfow thread 1568091