added some more to the second feature branch