WIP refactor of capfire.rb
Merge branch 'master' into refactor
refactor and proper scopes made with working tests