More progress.. just fixing compilation errors and replacing classes