refactored - merged tasks and traits into same file