Pushing latest version of code, beginning to start FloatCanvas intergation