Keeping Kubiak (Merged)

I don't think we have to worry about this anymore