Stuff added, preparing to use buffer objects