All logic completed. Pending some UI changes stated to Rafael and some
validation using Jquery