WIP - only return doubles
WIP - cleanup