Add update hardCodedView logic to freestored
Remove TODO