No substantial changes made
Made various class access changes and fixed a few syntax issues