Picking up this project again. Edited the comments