Add rudimentary functionality