First commit with working wrapper script