massive cleanup, almost ready to demo, h-7