Initial implementation with minimal testcases