Started rearranging and parameterizing.  Added screws.