Refactoring beginning at the beginning…main.

nuking this but keep it too