moved all local storage into clean setters and getters