Most of the bugs fixed, almost working cross thing.