Thats the plan, I'm going to finish making comments here, then merge it.