added a bit more of the basic structure