Framework

Hard shifting the application to a more ideal state of the framework.