changes before merge
merged
still working on following
follow button done