Fixed constructor, working on saving