Adds placeholder support

NOT READY TO BE MERGED

shouldnt this be in array form?