!U refactoring + puck prediction impl was started