Added basic functions, currently untested