@allgarbled + use our standard component and delete this code