Rearrange methods
Add TODOs
Add shape get/set sensor tests