various hacks to just get it in and working. Works now. Time for other
things.