New Consumer

Made a super quick run at this. Haven't tested it yet lol... Hopefully it makes sense, check before merging please.