added more property folder madness