Commit firmware TODO with some design thoughts