Tweaked Entites A Lot. They might work for now.