Some error catching
Add Pry, skele-test, refactor slightly