Testing shiv
Fix coming up
Should fix #1. Testing on another machine