Add some quick changes as proof-of-concept [WIP]