Get it mostly working