added a little more structure
added a little more structure