Modified several functions, attempted DAA Refactor