Added some octuple x content.
Merged dirty into master.