New framework - still things to add so making a separate repo