More edits now that I have placeholders