Added some features. But steel a lot of work needed.