Starting to add shader support