Initial progress on new framework