commit before pull
merged
more work on trim refactoring..