more work on organization
super tired of this