cam and bom updates.
Merge.
Semi functional code.