wip
Better rake task