WIP fixing to use VAOs

Not sure what I set up wrong, but I'll get there. Need to give up for
tonight.