Progress, was compiling now fixing up code to behave properly