Started working on a more configurable/adaptable framework