refactor/restructure
test query
test for edit arms query