Getting more things working... still very early stage