working version needs fixes
v0.1