merging over arons stuff