Redo-ing first commit - this time with the actual code! (Previous files were empty, submitted the wrong ones)