Adding TODO notes
StackStrap-ize