finished up most of the inheritance stuff