Added interface functions, started on testcase