WIP commit - see major TODOs in Code for further.