Began fixing old code - now compiles