finishing xdebug
Will rebase