Adding ideas to save pandas and abominations.
Merged master with conflicts