demo in working state, renamed files to match code