More hacks to get something working