Update to framework
Adding logic and db layers