Fix src; Add listeners; Got it working