Refactored
Added inputosaurus to aid tagging