all working

left to do:
some cleanup in guy
some cleanup in code