Revert "Nicholas - Commit 1"

This reverts commit ffb856bfbae69308db9704acd9728baf8edb2ac3.