copied jsimone's files into this project