general cleanup on classes and methods + arrows working and needing refinement