Merge pull request #13 from huntwelch/brain_surgery

Brain surgery
Update current TODO