Made it do what we want kinda sort of almost