This commit sucks. I know I had a good idea last night but went to sleep
with it in a non working order. Going to flip back to the previous
commit.