Starting fresh

Cleaned out basically all of the procs, gave them better names