Rewrote most of the line timing. I think it's right now