nearly finished stripping down

Needs debugging