a bit more backend work on things