more complete -- but not quite working yet

any thoughts? see any bugs?