Hacky but builds and 'works'