Remove old method call and comments
Begin to implement handler functionality
WIP using handler