homework addons

/cc @PeterBell @dbrizan