REFACTOR

-Naming conventions, and exposed Physics