Add Functionality and Fix Rubocop