WIP - Returns analyzer working