Finished checking backwards compability. Ready to merge.