working on remaining shit