Revert "Revert "Nicholas - Commit 1""

This reverts commit 3bdf88501847fbef1b8e5f06470f8d3ba3035d09.