[WIP] Try a different approach.