start adding handheld support