Closest view controller 2.0

Figured I should probably get this pushed since I said I would do it
last weekend...