commit to sync with armin - removed some of the setupdb stuff to backend calls
merge