some changes, still needs some site.pp work