[TMP] Try expanding out proplists

WIP