Initial commit with partially functional service