Going to do bad things, better to commit this working version