ja ne, more refactor, start removing event driven coding