working on cleaning up the framework a little bit :-)