First Fix

First fix of the beginning to the final product.