Post mech build rewrite

Merge the rewrite with proper code back into the Master Branch since development has ceased.