add my name
comment out large blocks and fix indentation
add generic tests