Some updates

Changed from basic objects to use maps, some small fixes have been pushed aswell

initial release

The basic start for the framework, still requires quite a bit customizing