Closes #2, Closes #3; Forgot to commit some files in previous commit...