There were a couple of little problems due to some changes I've made, but it seems to working OKish now