Merge Victor's changes
Unbreak the build. Again. Dammit, Victor

Use the right getters and setters... YOU WROTE THEM