Cleanup and edits

added super-ultra-simple implementation.