cleaned up 100, still need to add plinks