Added various functionality and tests