Bringing it all in

Fixing it all