attempting to organize better