stablized codebase for further changes
working on the new backend design