First attempt

to clean up my own mess