Some initial functionality added