added basic functionality. First alpha build ready