added stuff, more to come tomorrow