Organized features some to try to clean up/ modularize