Added basic functionality and first test