beta version

Almost done, need some css