Refactored stuff again and added straight path.