Merge pull request #1 from yehppael/master

Add waste management functionality
Fix failing tests (waste)
add waste full functionality and tests