Moving code around, trying to get things to compile