More work/debugging on part 2