Refactuary

This has the refactor and adding radio buttons