Functionality added. Still need to add CSS to pretify