Newest Changes

These Files now all compile together