nearly done

everything seems to be working and is cleaned up. No pretty result to
show though