working todo backend! pre-tidy up for demo purposes...