Updated all the getters and setters so they actually return the correct things. All tests currently compile.