Added helper features

Needs fixing - user.home is not currently being resolved!