This is still broken, maybe just go monolithic