smaller changes (some getter/setter, began writing parser)