slimmed down new and today
refactored this week
moar refactoring