Closed #39, that involved finishing link adding front-end side
Merge