Commit 18 - adding everything surrounding first function