Major refactor of handheld devices