Feature/rewrite

clean code, (transparently) stateless component!!