worked on to field, placeholders, bugs
merging
merging