Clean-Up

Going to start again and not be so environment-agnostic.