Incorporated ideas after brain bounce with Dan