homework addons

/cc @PeterBell @dbrizan 
@PeterBell Think it's worthwhile for them to read this whole thing?