Got Fluidbox working again. More class changes!