WIP - all configurations I had to adjust to get this running (untested).