[WIP] Initial stab at fixing the first broken function

On 0.9.8