ASDI - Fixed many issues. Still need to get edit/pull data working