Add some more guidelines, still wip