Tidying up, began weapons entry form