- push mostly working code out