Fixed linking, now fix presentation
Prod ready, need async still
Prod ready - async