318 rebuild

Thank you to everyone for the input.