Revert "Revert "More code""

This reverts commit 780bae49bd9d0566bd91440073a17367a7cffaee.