Restarted

Did not incorporate all the needed pieces in the original code, which
was already becoming bigger than necessary. So, i’ve started over.