updated files to latest local versions and I'm... still working on the getters and setters