Revert last commit for now, I think I am doing this wrong.