Merged fits_canvas and galaxy_model and started code rewrite to support new features