v0.1 working
master cleaning