Fixed PropertyManager, fully working, saving properly