huge refactor riffs - will update readme next commit with the changes
readme updates for previous refactors