trash removed

this is the first real work version