Starting from anew.

Taking the chance to make this properly. Cleaning it out a bit!