Continued work on new backend