progress towards proper packagification--still needs to switch to underscore and get tests