Finally to the point where I'm working on pricing.

Will finish this tonight barring more computer issues