Heavy

Closes #2008 
Closes #2009