committing recent work
added more configuration classes