Add first BlockLogic and clean up