simplified quite a bit
version 0.1.0