starting to modularize issues