Rename Rack to Racks
Switch to OO-style
Also tons of random cleanup
Update todo