Intermediary commit with mostly working showcase