Handler done. Still more testing needed..