class 2 homework addons

/cc @PeterBell @dbrizan