shelf works again. closes #30

6 jobs for feature/shelf in 10 minutes and 12 seconds