rubocopped and working on tests
pulled