Got rid of some of the madness, will try again

Moving forward.