Ugly fix to make it work, but it does. Fixed structure, now we just need an implementation.