Giant rework, but still need debugging a lot