Added all functionality minus that for indices. Will finish that up when possible