Added Rangers controller and some logic