Close very close..... commiting and adding a few more features