Add more TODOs
Add Shape surface velocity setter/getter