Added Straight, tests are derpy