Initial commit (working implementation)