Total mess up

This branch is messed up and I could not figure out why and where.