Begin implementing BLOC and STDT + adding icons