Added Tracks

A few touchups on object proto-types too