Finished including eigenvector support!