na - complete and utter refactoring.