Time For a rebuild

Here are some updates if anyone is interested.

Trevor