More hacks to get it up and running