aplha version completed with minor bugs