Preliminary tube work. Still very buggy.