We are 80% done so far!

fine tuning the functionalities